merge trunk
authorK. Handa <handa@gnu.org>
Sun, 8 Sep 2013 12:08:36 +0000 (21:08 +0900)
committerK. Handa <handa@gnu.org>
Sun, 8 Sep 2013 12:08:36 +0000 (21:08 +0900)

Trivial merge